merge trunk
authorKenichi Handa <handa@etlken>
Fri, 28 May 2010 06:45:43 +0000 (15:45 +0900)
committerKenichi Handa <handa@etlken>
Fri, 28 May 2010 06:45:43 +0000 (15:45 +0900)
commit138ecd635310eb91da7c4c8815c0da56fb8c2d90
treec0d844e4ab67791b00f13295ed6d7c5b1324f9dc
parentd65b2e8f89646fe9bcc3ed9288f8dd238e97ef48
parentd15c354b49e2091a1b49408a477b04fd0fa948d2
merge trunk
src/ChangeLog